Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Visual studio project files #9716

Merged
merged 3 commits into from
Feb 4, 2021
Merged

Fix Visual studio project files #9716

merged 3 commits into from
Feb 4, 2021

Conversation

Megamouse
Copy link
Contributor

No description provided.

@Nekotekina
Qt: remove Q_OBJECT for mouse/kb handlers
77d6da9 
Had to move QObject in parent list for g_fxo changes.
@Megamouse
Copy link
Contributor Author

lol. I didn't see this was based on neko master

@Megamouse Megamouse marked this pull request as draft February 4, 2021 19:17
@Nekotekina
Copy link
Member

Oh, maybe you can rebase keeping only my first commit since it can be merged separately.

@Megamouse
Copy link
Contributor Author

done

@Megamouse Megamouse marked this pull request as ready for review February 4, 2021 19:46
@Megamouse Megamouse merged commit 7e0fdbb into RPCS3:master Feb 4, 2021
@Megamouse Megamouse deleted the cofgg branch February 5, 2021 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
OS: Windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Megamouse @Nekotekina